Auto merge of #3229 - martinhath:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Oct 2016 21:18:01 +0000 (14:18 -0700)
committerGitHub <noreply@github.com>
Tue, 25 Oct 2016 21:18:01 +0000 (14:18 -0700)
commitad47f0a092e3b79718b2e529f763f70421255513
tree914b46660b9e2b0226926a78f6c5bcbca861db37
parent62b5992f0ebcbb9077fbd1a5d53c0378c67b95d2
parent84fe0707d4848827ba9645e3fd18c2851f077a35
Auto merge of #3229 - martinhath:master, r=alexcrichton

Add fix and test for #3224

This commit fixes #3224, and adds a test for it.
First time contributor to Cargo here, so I'm sorry if I put stuff the wrong places :)